From ddfc7377d40fa398a4606177eeea817aded34d59 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Thu, 29 Nov 2001 20:09:41 +0000 Subject: [PATCH] assertion here that we were at the end iterator was not correct; change 2001-11-29 Havoc Pennington * gtk/gtktextiter.c (_gtk_text_iter_forward_indexable_segment): assertion here that we were at the end iterator was not correct; change code to move us to the end iterator. bug #65731 --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtktextiter.c | 9 ++++++--- 8 files changed, 48 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2aa81d2cce..a13891feb9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-11-29 Havoc Pennington + + * gtk/gtktextiter.c (_gtk_text_iter_forward_indexable_segment): + assertion here that we were at the end iterator was not correct; + change code to move us to the end iterator. bug #65731 + Wed Nov 28 20:05:44 2001 Owen Taylor * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 2aa81d2cce..a13891feb9 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +2001-11-29 Havoc Pennington + + * gtk/gtktextiter.c (_gtk_text_iter_forward_indexable_segment): + assertion here that we were at the end iterator was not correct; + change code to move us to the end iterator. bug #65731 + Wed Nov 28 20:05:44 2001 Owen Taylor * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2aa81d2cce..a13891feb9 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2001-11-29 Havoc Pennington + + * gtk/gtktextiter.c (_gtk_text_iter_forward_indexable_segment): + assertion here that we were at the end iterator was not correct; + change code to move us to the end iterator. bug #65731 + Wed Nov 28 20:05:44 2001 Owen Taylor * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 2aa81d2cce..a13891feb9 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2001-11-29 Havoc Pennington + + * gtk/gtktextiter.c (_gtk_text_iter_forward_indexable_segment): + assertion here that we were at the end iterator was not correct; + change code to move us to the end iterator. bug #65731 + Wed Nov 28 20:05:44 2001 Owen Taylor * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2aa81d2cce..a13891feb9 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2001-11-29 Havoc Pennington + + * gtk/gtktextiter.c (_gtk_text_iter_forward_indexable_segment): + assertion here that we were at the end iterator was not correct; + change code to move us to the end iterator. bug #65731 + Wed Nov 28 20:05:44 2001 Owen Taylor * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2aa81d2cce..a13891feb9 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2001-11-29 Havoc Pennington + + * gtk/gtktextiter.c (_gtk_text_iter_forward_indexable_segment): + assertion here that we were at the end iterator was not correct; + change code to move us to the end iterator. bug #65731 + Wed Nov 28 20:05:44 2001 Owen Taylor * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2aa81d2cce..a13891feb9 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2001-11-29 Havoc Pennington + + * gtk/gtktextiter.c (_gtk_text_iter_forward_indexable_segment): + assertion here that we were at the end iterator was not correct; + change code to move us to the end iterator. bug #65731 + Wed Nov 28 20:05:44 2001 Owen Taylor * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c index 5a00c1760a..a7e685fbc5 100644 --- a/gtk/gtktextiter.c +++ b/gtk/gtktextiter.c @@ -2010,14 +2010,17 @@ _gtk_text_iter_forward_indexable_segment (GtkTextIter *iter) } else { - /* End of buffer */ + /* End of buffer, but iter is still at start of last segment, + * not at the end iterator. We put it on the end iterator. + */ check_invariants (iter); g_assert (!_gtk_text_line_is_last (real->line, real->tree)); g_assert (_gtk_text_line_contains_end_iter (real->line, real->tree)); - if (!gtk_text_iter_is_end (iter)) - _gtk_text_btree_spew (_gtk_text_iter_get_btree (iter)); + + gtk_text_iter_forward_to_line_end (iter); + g_assert (gtk_text_iter_is_end (iter)); return FALSE; -- 2.30.2